Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Sun, 12 Jul 2009 12:48:39 +0000 (14:48 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Sun, 12 Jul 2009 12:48:39 +0000 (14:48 +0200)

Trivial merge